From 70aa5e97ae31b058ae93262201f3892bff5fc677 Mon Sep 17 00:00:00 2001 From: Stefano Zacchiroli Date: Sat, 16 Jun 2007 16:04:58 +0000 Subject: [PATCH] fixing ocamlbuild installation --- debian/TODO.Debian | 2 -- debian/changelog | 5 +++-- debian/patches/install_ocamlbuild.dpatch | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/debian/TODO.Debian b/debian/TODO.Debian index c219c61d..f9bfcfa9 100644 --- a/debian/TODO.Debian +++ b/debian/TODO.Debian @@ -1,7 +1,5 @@ TODO list for ocaml 3.10.0 (and beyond ...) -- ocamlbuild is not installed - - lintian warnings lintian /home/srv/debian/pkg-ocaml-maint/packages/ocaml/build-area/ocaml_3.10.0-3_i386.changes diff --git a/debian/changelog b/debian/changelog index af5a7e55..252cd421 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,8 @@ ocaml (3.10.0-3) UNRELEASED; urgency=low * debian/patches/00list - - enabled install_ocamlbuild patch, which was disabled by mistake + - enabled install_ocamlbuild patch (was disabled by mistake) and patched + it fixing a wrong path * debian/rules - pass -libdir to configure (now that it is supported upstream) in addition to sed-ing generated config Makefiles; otherwise ocamlrun won't @@ -9,7 +10,7 @@ ocaml (3.10.0-3) UNRELEASED; urgency=low * debian/ocaml-md5sums/ocaml-md5sums.1 - written ocaml-md5sums manpage - -- Stefano Zacchiroli Sat, 16 Jun 2007 16:41:03 +0100 + -- Stefano Zacchiroli Sat, 16 Jun 2007 16:03:48 +0000 ocaml (3.10.0-2) experimental; urgency=low diff --git a/debian/patches/install_ocamlbuild.dpatch b/debian/patches/install_ocamlbuild.dpatch index 2404484d..1db19a5a 100755 --- a/debian/patches/install_ocamlbuild.dpatch +++ b/debian/patches/install_ocamlbuild.dpatch @@ -16,9 +16,9 @@ diff -urNad ocaml-3.10.0~/build/partial-install.sh ocaml-3.10.0/build/partial-in -installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE -installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE +#installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild.byte$EXE -+installbin ocamlbuild/ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE ++installbin ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE +#installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.native$EXE -+installbin ocamlbuild/ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE ++installbin ocamlbuild.native$EXE $BINDIR/ocamlbuild.opt$EXE +#installbestbin ocamlbuild.native$EXE ocamlbuild.byte$EXE $BINDIR/ocamlbuild$EXE installlibdir \ -- 2.30.2